Use external libgsystem 2014.2

It's been split off for a while, let's kill the code duplication.

Among other things, this fixes the systemd detection for the journal
logging.

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644 (file)
index f456a14..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "src/libgsystem"]
-       path = src/libgsystem
-       url = git://git.gnome.org/libgsystem

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 988f1cbfe2b7e86e1e476cf7655c5e551f0c3852..30962068889b3e26d1c37342ca88ad8e9d00c830 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -83,7 +83,7 @@ libostree_1_la_SOURCES += src/libostree/ostree-libarchive-input-stream.h \
        $(NULL)
 endif
 
-libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" -DGPGVPATH=\"$(GPGVPATH)\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+libostree_1_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -DLOCALEDIR=\"$(datadir)/locale\" -DGPGVPATH=\"$(GPGVPATH)\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 libostree_1_la_LDFLAGS = -version-number 1:0:0 -Bsymbolic-functions -export-symbols-regex '^ostree_'
 libostree_1_la_LIBADD = libotutil.la libostree-kernel-args.la $(OT_INTERNAL_GIO_UNIX_LIBS)
 

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 46895597631b9c889441e46fe7d5810a094c6fb1..219276f6975b759c57eaf7510ed3619c639c1444 100644 (file)
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -70,7 +70,7 @@ ostree_SOURCES += \
        src/ostree/ot-admin-functions.c \
        $(NULL)
 
-ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree  -DLOCALEDIR=\"$(datadir)/locale\"
+ostree_bin_shared_cflags = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -I$(srcdir)/src/libostree -I$(srcdir)/src/ostree  -DLOCALEDIR=\"$(datadir)/locale\"
 ostree_bin_shared_ldadd = libotutil.la libostree-kernel-args.la libostree-1.la
 
 ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)

diff --git a/Makefile-otutil.am b/Makefile-otutil.am
index 47ea98cf437a6edba40501eabb340dcc295decb6..8f77543d982781c51d596654ee0b23e37a7654f4 100644 (file)
--- a/Makefile-otutil.am
+++ b/Makefile-otutil.am
@@ -39,5 +39,5 @@ libotutil_la_SOURCES = \
        src/libotutil/otutil.c \
        src/libotutil/otutil.h \
        $(NULL)
-libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libgsystem -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
-libotutil_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS) libgsystem.la
+libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/src/libotutil -DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
+libotutil_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS)

diff --git a/Makefile.am b/Makefile.am
index b20738a0771631c874259671f3ee5879570f7a46..a9bdb11804ce4f5bebf633345694d9295d306398 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,13 +65,6 @@ OT_INTERNAL_SOUP_CFLAGS = $(OT_DEP_SOUP_CFLAGS)
 OT_INTERNAL_SOUP_LIBS = $(OT_DEP_SOUP_LIBS)
 endif
 
-libgsystem_srcpath := src/libgsystem
-libgsystem_cflags = $(OT_INTERNAL_GIO_UNIX_CFLAGS) -I$(srcdir)/src/libgsystem -DGSYSTEM_CONFIG_XATTRS
-libgsystem_libs = $(OT_INTERNAL_GIO_UNIX_LIBS)
-include src/libgsystem/Makefile-libgsystem.am
-noinst_LTLIBRARIES += libgsystem.la
-
-
 if BUILDOPT_INTROSPECTION
 include $(INTROSPECTION_MAKEFILE)
 GIRS =

diff --git a/autogen.sh b/autogen.sh
index 92548409efa74edc20ff1709efbaba026a36b225..fe690e9ff974082cdc111dc691046379516e4e56 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,14 +16,6 @@ set -e
 
 mkdir -p m4
 
-# Fetch submodules if needed
-if test ! -f src/libgsystem/README;
-then
-  echo "+ Setting up submodules"
-  git submodule init
-  git submodule update
-fi
-
 GTKDOCIZE=$(which gtkdocize 2>/dev/null)
 if test -z $GTKDOCIZE; then
         echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation."

diff --git a/configure.ac b/configure.ac
index 13a0b48e4cd7d7930cd63ffe833895370ffae59c..215822de7e46c524abb079a5c5c1774f2eb30ed2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,7 @@ AS_IF([test x$enable_embedded_dependencies = xyes], [
   echo "NOTICE: Embedded dependencies (GLib and libsoup) enabled"
   with_soup=yes
 ], [
-  GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0"
+  GIO_DEPENDENCY="gio-unix-2.0 >= 2.34.0 libgsystem >= 2014.2"
   PKG_CHECK_MODULES(OT_DEP_GIO_UNIX, $GIO_DEPENDENCY)
 
   SOUP_DEPENDENCY="libsoup-2.4 >= 2.39.1"

diff --git a/src/libgsystem b/src/libgsystem
deleted file mode 160000 (submodule)
index 7a24997..0000000
--- a/src/libgsystem
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a2499708b6aa0be5a67e4a75de66fb9c18516af